(mule-diag): Move where it's

required.

diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 33975a6eb2f228be86d0fccb3837501f705efe48..3049ae5863c7d621b2282d879c930937f48606dc 100644 (file)
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -54,8 +54,6 @@
 
 ;;; Code:
 
-(require 'mule-diag)                   ; for non-iso-charset-alist
-
 (defun cp-make-translation-table (v)
   "Return a translation table made from 128-long vector V.
 V comprises characters encodable by mule-utf-8."
@@ -152,6 +150,11 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal."
        cp (cp-charset-for-codepage cp) (cp-offset-for-codepage cp))))))
 )                                      ; eval-after-load
 
+;; For `non-iso-charset-alist'.  Do this after redefining
+;; `cp-supported-codepages', which is called through loading
+;; mule-diag.
+(require 'mule-diag)
+
 ;; Macro to allow ccl compilation at byte-compile time, avoiding
 ;; loading ccl.
 ;;;###autoload